helm: Fix in-cluster remote URLs when gateway and nginx are disabled #10625

kimxogus · 2025-02-11T06:16:43Z

What this PR does

Current mimir-distributed helm chart creates in-cluster remote urls nginx service's cluster url even when nginx is disabled.

mimir/operations/helm/charts/mimir-distributed/templates/_helpers.tpl

Lines 37 to 43 in 9144986

    
           {{- define "mimir.gatewayUrl" -}} 
        
           {{- if eq (include "mimir.gateway.isEnabled" . ) "true" -}} 
        
           http://{{ include "mimir.gateway.service.name" . }}.{{ .Release.Namespace }}.svc:{{ .Values.gateway.service.port | default (include "mimir.serverHttpListenPort" . ) }} 
        
           {{- else -}} 
        
           http://{{ template "mimir.fullname" . }}-nginx.{{ .Release.Namespace }}.svc:{{ .Values.nginx.service.port }} 
        
           {{- end -}} 
        
           {{- end -}}

https://github.com/grafana/mimir/blob/9144986d6b9a662508b44a07884d46dc2f3da73a/operations/helm/charts/mimir-distributed/templates/_helpers.tpl#L551-557

This PR fixes this behavior. mimir.remoteWriteUrl.inCluster and mimir.remoteReadUrl.inCluster will be query-frontend and distributor's url when both gateway and nginx are disabled.

Which issue(s) this PR fixes or relates to

none

Checklist

Tests updated.
Documentation added.
CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
about-versioning.md updated with experimental features.

operations/helm/charts/mimir-distributed/CHANGELOG.md

Co-authored-by: Taylor C <[email protected]>

narqo

Looks good to me. Thank you for fixing it.

operations/helm/charts/mimir-distributed/CHANGELOG.md

* Fix in-cluster remote urls when gateway and nginx are disabled * fix template * update CHANGELOG.md * fix CHANGELOG.md * Update operations/helm/charts/mimir-distributed/CHANGELOG.md Co-authored-by: Taylor C <[email protected]> * Update operations/helm/charts/mimir-distributed/CHANGELOG.md --------- Co-authored-by: Taylor C <[email protected]> Co-authored-by: Vladimir Varankin <[email protected]>

kimxogus added 2 commits February 11, 2025 14:56

Fix in-cluster remote urls when gateway and nginx are disabled

d3c417d

fix template

51e8521

kimxogus requested a review from a team as a code owner February 11, 2025 06:16

kimxogus added 2 commits February 11, 2025 15:17

update CHANGELOG.md

ecab54f

fix CHANGELOG.md

9eab10a

tacole02 reviewed Feb 11, 2025

View reviewed changes

operations/helm/charts/mimir-distributed/CHANGELOG.md Outdated Show resolved Hide resolved

Update operations/helm/charts/mimir-distributed/CHANGELOG.md

a044b0b

Co-authored-by: Taylor C <[email protected]>

narqo approved these changes Feb 14, 2025

View reviewed changes

operations/helm/charts/mimir-distributed/CHANGELOG.md Outdated Show resolved Hide resolved

Update operations/helm/charts/mimir-distributed/CHANGELOG.md

ec18911

narqo enabled auto-merge (squash) February 14, 2025 19:38

narqo changed the title ~~Fix in-cluster remote urls when gateway and nginx are disabled~~ helm: Fix in-cluster remote URLs when gateway and nginx are disabled Feb 14, 2025

narqo merged commit 74c29a9 into grafana:main Feb 14, 2025
30 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

helm: Fix in-cluster remote URLs when gateway and nginx are disabled #10625

helm: Fix in-cluster remote URLs when gateway and nginx are disabled #10625

kimxogus commented Feb 11, 2025 •

edited by narqo

Loading

narqo left a comment

	{{- define "mimir.gatewayUrl" -}}
	{{- if eq (include "mimir.gateway.isEnabled" . ) "true" -}}
	http://{{ include "mimir.gateway.service.name" . }}.{{ .Release.Namespace }}.svc:{{ .Values.gateway.service.port \| default (include "mimir.serverHttpListenPort" . ) }}
	{{- else -}}
	http://{{ template "mimir.fullname" . }}-nginx.{{ .Release.Namespace }}.svc:{{ .Values.nginx.service.port }}
	{{- end -}}
	{{- end -}}

helm: Fix in-cluster remote URLs when gateway and nginx are disabled #10625

helm: Fix in-cluster remote URLs when gateway and nginx are disabled #10625

Conversation

kimxogus commented Feb 11, 2025 • edited by narqo Loading

What this PR does

Which issue(s) this PR fixes or relates to

Checklist

narqo left a comment

Choose a reason for hiding this comment

kimxogus commented Feb 11, 2025 •

edited by narqo

Loading